Added more code to work with portfolio