* Adding internal feature to expose underlying elements * Applying @daxpedda's comments and suggestions