More refactoring from apps to buckets
Updated console methods