Changed some logic to make it similar to SASS architecture