Made things more customizable / more library like