expanded methods, need to be tested in real environment, also some additional params to db queries may be needed