Basic funcionality added