Slimmed interface to get rid of unnecssary declarations
Updated with more goodness