Formatting changed to 4spaces + Components support added