Finalized the minimum required functionality